RECLAIM: Fix ticket consume flowHEADmaster

7 files changed, 11 insertions, 10 deletions

diff --git a/contrib/gana b/contrib/gana
-Subproject e6540cf597091eabaa732826d5ad1185f4bcc5c
+Subproject 53d0992890e1ebb8f8c6bd747533abe157baec6
diff --git a/contrib/handbook b/contrib/handbook
-Subproject 7d66dc1695829f2511f8e8ecc227a64d73d1562
+Subproject c309e416984fc76e4b39adcbd4e8a602d94b198
diff --git a/src/service/reclaim/gnunet-service-reclaim.c b/src/service/reclaim/gnunet-service-reclaim.c
index 368e39ec3..a9a427d90 100644
--- a/src/service/reclaim/gnunet-service-reclaim.c
+++ b/src/service/reclaim/gnunet-service-reclaim.c
@@ -1025,6 +1025,7 @@ handle_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm)
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received CONSUME_TICKET message\n");
   tkt_len = ntohs (cm->tkt_len);
+  buf = (char*) &cm[1];
   if ((GNUNET_SYSERR ==
        GNUNET_RECLAIM_read_ticket_from_buffer (buf, tkt_len,
                                                &ticket, &read)) ||
diff --git a/src/service/reclaim/reclaim_api.c b/src/service/reclaim/reclaim_api.c
index 0fe49c37d..92e240587 100644
--- a/src/service/reclaim/reclaim_api.c
+++ b/src/service/reclaim/reclaim_api.c
@@ -1782,7 +1782,7 @@ GNUNET_RECLAIM_write_ticket_to_buffer (const struct
     return written;
   left -= written;
   tmp += written;
-  memcpy (&tmp, tkt->rp_uri, strlen (tkt->rp_uri) + 1);
+  memcpy (tmp, tkt->rp_uri, strlen (tkt->rp_uri) + 1);
   written = strlen (tkt->rp_uri) + 1;
   left -= written;
   tmp += written;
diff --git a/src/service/rest/oidc_helper.c b/src/service/rest/oidc_helper.c
index 810e4e264..15133b270 100644
--- a/src/service/rest/oidc_helper.c
+++ b/src/service/rest/oidc_helper.c
@@ -211,7 +211,8 @@ generate_userinfo_json (const struct GNUNET_CRYPTO_PublicKey *sub_key,
     pres_val_str =
       GNUNET_RECLAIM_presentation_value_to_string (ple->presentation->type,
                                                    ple->presentation->data,
-                                                   ple->presentation->data_size);
+                                                   ple->presentation->data_size)
+    ;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Presentation is: %s\n", pres_val_str);
     json_object_set_new (aggr_sources_jwt,
@@ -370,7 +371,6 @@ generate_id_token_body (const char *rp_uri,
   struct GNUNET_TIME_Absolute exp_time;
   struct GNUNET_TIME_Absolute time_now;
   json_t *body;
-  char *audience;
   char *subject;
   char *body_str;
 
@@ -413,7 +413,6 @@ generate_id_token_body (const char *rp_uri,
 
   json_decref (body);
   GNUNET_free (subject);
-  GNUNET_free (audience);
 
   return body_str;
 }
@@ -470,6 +469,7 @@ OIDC_generate_id_token_rsa (const char *rp_uri,
   return result;
 }
 
+
 char *
 OIDC_generate_id_token_hmac (const char *rp_uri,
                              const struct GNUNET_CRYPTO_PublicKey *sub_key,
@@ -676,9 +676,9 @@ OIDC_build_authz_code (const struct GNUNET_CRYPTO_PrivateKey *issuer,
   // Sign and store signature
   if (GNUNET_SYSERR ==
       GNUNET_CRYPTO_sign_ (issuer,
-                             purpose,
-                             (struct GNUNET_CRYPTO_Signature *)
-                             buf_ptr))
+                           purpose,
+                           (struct GNUNET_CRYPTO_Signature *)
+                           buf_ptr))
   {
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unable to sign code\n");
diff --git a/src/service/rest/oidc_helper.h b/src/service/rest/oidc_helper.h
index d3988f421..08aedc2ed 100644
--- a/src/service/rest/oidc_helper.h
+++ b/src/service/rest/oidc_helper.h
@@ -95,7 +95,7 @@ OIDC_generate_id_token_hmac (const char *rp_uri,
  * Builds an OIDC authorization code including
  * a reclaim ticket and nonce
  *
- * @param rp_uri the RP URI
+ * @param issuer the issuer
  * @param ticket the ticket to include in the code
  * @param attrs list of attributes to share
  * @param presentations credential presentation list
@@ -105,7 +105,7 @@ OIDC_generate_id_token_hmac (const char *rp_uri,
  * @return a new authorization code (caller must free)
  */
 char*
-OIDC_build_authz_code (const char *rp_uri,
+OIDC_build_authz_code (const struct GNUNET_CRYPTO_PrivateKey *issuer,
                        const struct GNUNET_RECLAIM_Ticket *ticket,
                        const struct GNUNET_RECLAIM_AttributeList *attrs,
                        const struct
diff --git a/src/service/rest/openid_plugin.c b/src/service/rest/openid_plugin.c
index b9e5a08e6..5fc98465a 100644
--- a/src/service/rest/openid_plugin.c
+++ b/src/service/rest/openid_plugin.c
@@ -2265,7 +2265,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
   }
 
   // decode code
-  if (GNUNET_OK != OIDC_parse_authz_code (&cid, code, code_verifier, &ticket,
+  if (GNUNET_OK != OIDC_parse_authz_code (ticket.rp_uri, code, code_verifier, &ticket,
                                           &cl, &pl, &nonce,
                                           OIDC_VERIFICATION_DEFAULT))
   {